From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 10 Oct 2016 14:35:32 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~2518
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=97046e811c738a21e0c4badbb5bab146b6adf6c8;p=emacs.git

Merge from origin/emacs-25

4b347fe Clarify that doc fixes are okay in feature freeze
01669ad Avoid crashes when setting the cursor
f2144ee Restore 'command-debug-status' functionality
ec6e4b9 ; Minor addition to CONTRIBUTE
---

97046e811c738a21e0c4badbb5bab146b6adf6c8